device: Add a num-touches property
authorMatthias Clasen <mclasen@redhat.com>
Thu, 25 Feb 2016 13:25:14 +0000 (08:25 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 25 Feb 2016 13:27:08 +0000 (08:27 -0500)
Some backends can provide this information for touch devices,
and it can be useful to have, so add this property.

gdk/gdkdevice.c
gdk/gdkdeviceprivate.h

index db36ced326483ce6a962302cd248c8e65ddaf85e..3edaa526f05bd0fae61bb1107c9f5634508ffd23 100644 (file)
@@ -91,6 +91,7 @@ enum {
   PROP_VENDOR_ID,
   PROP_PRODUCT_ID,
   PROP_SEAT,
+  PROP_NUM_TOUCHES,
   LAST_PROP
 };
 
@@ -287,6 +288,24 @@ gdk_device_class_init (GdkDeviceClass *klass)
                            G_PARAM_READWRITE |
                            G_PARAM_STATIC_STRINGS);
 
+  /**
+   * GdkDevice:num-touches:
+   *
+   * The maximal number of concurrent touches on a touch device.
+   * Will be 0 if the device is not a touch device or if the number
+   * of touches is unknown.
+   *
+   * Since: 3.20
+   */
+  device_props[PROP_NUM_TOUCHES] =
+      g_param_spec_uint ("num-touches",
+                         P_("Number of concurrent touches"),
+                         P_("Number of concurrent touches"),
+                         0, G_MAXUINT,
+                         0,
+                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+                         G_PARAM_STATIC_STRINGS);
+
   g_object_class_install_properties (object_class, LAST_PROP, device_props);
 
   /**
@@ -400,6 +419,9 @@ gdk_device_set_property (GObject      *object,
     case PROP_SEAT:
       device->seat = g_value_get_object (value);
       break;
+    case PROP_NUM_TOUCHES:
+      device->num_touches = g_value_get_uint (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -452,6 +474,9 @@ gdk_device_get_property (GObject    *object,
     case PROP_SEAT:
       g_value_set_object (value, device->seat);
       break;
+    case PROP_NUM_TOUCHES:
+      g_value_set_uint (value, device->num_touches);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
index 7675895eb80fe8b275ad1c6b5a62fff80cdabde1..2350d0288664715f5b99651b366b26e4af9c7403 100644 (file)
@@ -57,6 +57,7 @@ struct _GdkDevice
   GList *slaves;
   GdkDeviceType type;
   GArray *axes;
+  guint num_touches;
 
   gchar *vendor_id;
   gchar *product_id;